Merge from trunk
authorDaniel Colascione <dancol@dancol.org>
Mon, 17 Sep 2012 12:07:36 +0000 (04:07 -0800)
committerDaniel Colascione <dancol@dancol.org>
Mon, 17 Sep 2012 12:07:36 +0000 (04:07 -0800)
commit7e201d24b98152ac53ab0344b60cf2045bc9fda7
tree6af25dd214e6ddf8303812c5d96ce7f894775788
parent24ceb8e54c8b6897d05f33049e53175b2f13b4dd
parent55da039de582293eb4ed62522b65ed7a5e9c5dbb
Merge from trunk
33 files changed:
configure.ac
lisp/frame.el
lisp/loadup.el
lisp/simple.el
lisp/startup.el
src/Makefile.in
src/conf_post.h
src/dispextern.h
src/emacs.c
src/font.c
src/font.h
src/fontset.c
src/frame.c
src/frame.h
src/image.c
src/keyboard.c
src/keyboard.h
src/menu.c
src/process.c
src/w32.c
src/w32console.c
src/w32fns.c
src/w32font.c
src/w32heap.c
src/w32inevt.c
src/w32menu.c
src/w32proc.c
src/w32select.c
src/w32term.c
src/w32xfns.c
src/window.c
src/xdisp.c
src/xfaces.c